x86/mca MCA minor bugfix

This patch fix a minor bug, when in xen context and cannot safely
return the mce break point, reset system;

Signed-off-by: Liu, Jinsong <jinsong.liu@intel.com>

diff --git a/xen/arch/x86/cpu/mcheck/mce_intel.c b/xen/arch/x86/cpu/mcheck/mce_intel.c
index 9ec4355b6dd9f35f9af9dd82c1aed96d46323fdd..dbbf9751ef2038885471ae5f9fe67fb6334a75cf 100644 (file)
--- a/xen/arch/x86/cpu/mcheck/mce_intel.c
+++ b/xen/arch/x86/cpu/mcheck/mce_intel.c
@@ -355,7 +355,7 @@ static int mce_urgent_action(struct cpu_user_regs *regs,
     gstatus = mca_rdmsr(MSR_IA32_MCG_STATUS);
     /* Xen is not pre-emptible */
     if ( !(gstatus & MCG_STATUS_RIPV) && !guest_mode(regs))
-        return 0;
+        return -1;
 
     return mce_action(regs, mctc) == MCER_RESET ? -1 : 0;
 }

diff --git a/xen/include/public/sysctl.h b/xen/include/public/sysctl.h
index ac7551701b9894ef3244f99f30c2c03200f782ee..c10a85d1f8a5921be90201a3c494d9a7679312c1 100644 (file)
--- a/xen/include/public/sysctl.h
+++ b/xen/include/public/sysctl.h
@@ -410,7 +410,7 @@ struct xen_sysctl_page_offline_op {
 
 #define PG_OFFLINE_MISC_MASK    (0xFFUL << 4)
 
-/* only valid when PG_OFFLINE_FAILED */
+/* valid when PG_OFFLINE_FAILED or PG_OFFLINE_PENDING */
 #define PG_OFFLINE_XENPAGE   (0x1UL << 8)
 #define PG_OFFLINE_DOM0PAGE  (0x1UL << 9)
 #define PG_OFFLINE_ANONYMOUS (0x1UL << 10)